menu button: Add a relief property

This is used in various places.

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index de3797b0929e9b6218672e2f15f8f0506a54feb6..ba5ff18e3766183fc0c5be635082f3ba54d1e68e 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1853,6 +1853,8 @@ gtk_menu_button_set_icon_name
 gtk_menu_button_get_icon_name
 gtk_menu_button_set_label
 gtk_menu_button_get_label
+gtk_menu_button_set_relief
+gtk_menu_button_get_relief
 <SUBSECTION Standard>
 GTK_TYPE_MENU_BUTTON
 GTK_MENU_BUTTON

diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 687a9c68500dc4afba40e8e2c51b1339a8c5f37a..eddef5584db348adfd6975719cd6e0b6236aa991 100644 (file)
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -155,6 +155,7 @@ enum
   PROP_POPOVER,
   PROP_ICON_NAME,
   PROP_LABEL,
+  PROP_RELIEF,
   LAST_PROP
 };
 
@@ -198,6 +199,9 @@ gtk_menu_button_set_property (GObject      *object,
       case PROP_LABEL:
         gtk_menu_button_set_label (self, g_value_get_string (value));
         break;
+      case PROP_RELIEF:
+        gtk_menu_button_set_relief (self, g_value_get_enum (value));
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -237,6 +241,9 @@ gtk_menu_button_get_property (GObject    *object,
       case PROP_LABEL:
         g_value_set_string (value, gtk_menu_button_get_label (GTK_MENU_BUTTON (object)));
         break;
+      case PROP_RELIEF:
+        g_value_set_enum (value, gtk_menu_button_get_relief (GTK_MENU_BUTTON (object)));
+        break;
       default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
     }
@@ -594,6 +601,14 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
                            NULL,
                            GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
 
+  menu_button_props[PROP_RELIEF] =
+    g_param_spec_enum ("relief",
+                       P_("Border relief"),
+                       P_("The border relief style"),
+                       GTK_TYPE_RELIEF_STYLE,
+                       GTK_RELIEF_NORMAL,
+                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
   g_object_class_install_properties (gobject_class, LAST_PROP, menu_button_props);
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_BUTTON_ACCESSIBLE);
@@ -1309,3 +1324,48 @@ gtk_menu_button_get_label (GtkMenuButton *menu_button)
 
   return NULL;
 }
+
+/**
+ * gtk_menu_button_set_relief:
+ * @menu_button: The #GtkMenuButton you want to set relief styles of
+ * @relief: The GtkReliefStyle as described above
+ *
+ * Sets the relief style of the edges of the given
+ * #GtkMenuButton widget.
+ *
+ * Two styles exist, %GTK_RELIEF_NORMAL and %GTK_RELIEF_NONE.
+ * The default style is, as one can guess, %GTK_RELIEF_NORMAL.
+ */
+void
+gtk_menu_button_set_relief (GtkMenuButton  *menu_button,
+                            GtkReliefStyle  relief)
+{
+  GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button);
+
+  g_return_if_fail (GTK_IS_MENU_BUTTON (menu_button));
+
+  if (relief == gtk_button_get_relief (GTK_BUTTON (priv->button)))
+    return;
+
+  gtk_button_set_relief (GTK_BUTTON (priv->button), relief);
+  g_object_notify_by_pspec (G_OBJECT (menu_button), menu_button_props[PROP_RELIEF]);
+}
+
+/**
+ * gtk_menu_button_get_relief:
+ * @menu_button: The #GtkMenuButton you want the #GtkReliefStyle from.
+ *
+ * Returns the current relief style of the given #GtkMenuButton.
+ *
+ * Returns: The current #GtkReliefStyle
+ */
+GtkReliefStyle
+gtk_menu_button_get_relief (GtkMenuButton *menu_button)
+{
+  GtkMenuButtonPrivate *priv = gtk_menu_button_get_instance_private (menu_button);
+
+  g_return_val_if_fail (GTK_IS_MENU_BUTTON (menu_button), GTK_RELIEF_NORMAL);
+
+  return gtk_button_get_relief (GTK_BUTTON (priv->button));
+}
+

diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index d26d93f0521c3d8f5d533fc5a408d6f31b69036e..c94dd49376bf44e5cf8af1346be9c5bbe606e642 100644 (file)
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -112,6 +112,11 @@ void         gtk_menu_button_set_label (GtkMenuButton *menu_button,
 GDK_AVAILABLE_IN_ALL
 const char * gtk_menu_button_get_label (GtkMenuButton *menu_button);
 
+GDK_AVAILABLE_IN_ALL
+void           gtk_menu_button_set_relief   (GtkMenuButton  *menu_button,
+                                             GtkReliefStyle  relief);
+GDK_AVAILABLE_IN_ALL
+GtkReliefStyle gtk_menu_button_get_relief   (GtkMenuButton  *menu_button);
 
 G_END_DECLS